Modified Constructor