Agentify - PR #310