Updated set functions