Updated some private fields and constructors