Further updates to resources and utilities refactoring