Adding enable/disable option