Refactor and support for Wunderlist