refactors due to method signature changes in parsing