Added enabled flag and enable/disable public functions