Final AFP push, polished strategies and structure module