Added leap support