Continued work
Added custom options for template