Add setup and related improvments.