Updates to keep in line with modules