If that will be the final solution, these classes should be moved to a separete file