Updated to add second constructor