Fixed null passed in for options across all methods #934
Added Grid to generation of api classes #931