Adding some osk specific stuff