Now Object Based, multi input support