Added good defaults and extras