Updated constructor initialization