Remove ResourceHandler, add Resource interface