Added a few more default valeus