Add keystone support

@pyeremenko @edsrzf Could you please review
Is this line needed?