Adding enable/disable API for #21