Added new all types method, corrected some names