overhaul parse modules