Removed callbacks for api methods and just returned values