Added some new features: bindings, directives etc.