Chore/better semantic classes