Better integration with refaker@0.2.0