Added enabled property to Client