Added some defaults and limits