Removed obsolete options
Use null template instead of nil