Last changes to work with Jersey