Fix for starter
Add two new types