Changed more constructors