Improve consersor WIP