Added ResourceManager & MasterState