Refactored and added static data