Refactored spring configuration and KVP filters