Added API version check