Change/add some filters, add vkp adn vkpa wrappers