Database improvement and server now saves equipment