Added missing parameters handler