Fixing build following refactor
Yet another try