Add props to @gcanti
Added TODO