Added parameterized parser