Fixed the Catalogue concurrency and Query classes
More fixes
Added lots of constructors with ByteBuffers