Added API authentication and Various Fix Model