moved simple types to separate class (refactoring)