Refactoring, lambda awesomeness and versioning.