Effected from Cockatoo refactoring