Moved empty and multi classes to container