Updated constructor names