Reworked parameters check