Updated to support parameters in the prefix