Updated to use object