Improved class-structure for more overview.