added previously missing classes