Added accessory class stuff