Improve the connection schema in app