Added Multi-Type Support