Extense refactor, fix #6