Moved classes to labels