Consolidated data loaders, added view states