Moved data to separate file