Add support for leap