Changed structure to prepare for tests