Updated constructor signatures for greater consistency