Switch to Behaviour factory check