Revamp configure