Updated due to change of method return type