Start of refactor to comply with new console-parser