do some refactoring
more refactoring
Avoid duplicated requests for resources