Adds tag support and key-chord