Add some defaults and my packages