Resolved dependencies and added needed default data.