Add plaid support
Fix merge conflict