added compatibility for API version 1.1