issue #1, moved control directives to map attributes