Added resource manager first classes and more stuff