Added enabled flag to machine class