Updated plan with new type, added new types, and moved things around