Review terminologies and architecture around resource management. Need more tests !