Added more frontend classes