Use proper factory method