Belongs to #140 changed method names