Removed dependency to POINT & LONG types.