Merge with rens copy. Server and database added