Adding more stub calls