First version with server integration