Constructor changes

Also const added