Refactor behind the scene to work good with the limitations of Falafel