Improved parameters resolution