Fix dependencies and REST CONTEXT