ResourceHandler now more responsible