Changes for mizuiro
Removed some ::type