More changes related with Add support for Substituting a custom User model #40