Change return type to list