Updated server methods
Some updateds on client side, work in progress
Updated collections