Update to move unnecessary type conversion