Add support for enable and start options