WIP on improving configure support