Directive improvements, customizing and samples