added security and master template