Smarter post ressurection, easier to extend. Close #146.