Agentify - PR #493