1. Changed namespace

2. Generic bind instead custom