- More changes to Vapor