Refactor directives. Add 'bbq-model' binding