Added more resources and refactored