Refactor to make it work with capeus.org