added support for generic points