Added new parsers for variants etc...