Some resources refactor