Enable, Disable and Status commands + improvements