Updated functions for manipulating props and values