Adding simple room loader and changing data structure