Fixed errors with calista api refactoring