Updates templates and adapter to work with rivets 0.6.