Make constructor usage consistent