No, it should be. That still needs refactoring (the WIP is partly for this)