Updated with new classes