Modified the constructors to make them work properly