Adding filter on capability
Incrementing current version
Incrementing tested version
Adding some more assertions to prevent errors