Adding some defaults and some dependencies