Updated to work with API 1.1