Made defaults more specific