Added some concrete types for entity annotation purposes.