Completed framework for login API support