Add support for Long