Updated constructor setup sequence