Simplified collections and moved methods to server