Changed WHERE condition parameter to optional