Allow passing more props
Add debug logging