Added parameters that needs to be extracted