Add initial leap support