Update Toolset, add some syntactic sugar