Added sensible defaults