Update with props for #184