Changes according to new API v2