Use plural keywords
Implements behavior integration
Merge branch 'feature/behavior' into develop