Added check if paramater exists