Added ddt and plx support