Added Sanity Checks and Defaults