Working on changes based on new API