cell directives refactored