Add support for long