Currently we have a lot of stop gap interfaces such as KeyValueAction that have now been replaced by newer Java 8 classes. We should move our classes over to remove redundant code and also provide more consistency.