Added behavior scope
Updates to work with v2