Roni, Soham | BDSHR-84 | Refactored create query.