Fixed constructors and merged