Refactor and unimp info