Updated Constructors