Updating config
Adding some resources
Removing static methods