Further complete the login module