Quick fork to support more data-types. No changes made to tests