Finished ResourceManager refactor, patterns have been simplified, still need to simplify option handling