Updated due to incorrect parameter types in property definition / return