Added data fixtures and modified some config files