Added feature map for wamp support