Updated server and database methods
Updated data cluster methods