Set more reasonable SOA defaults
Added new features from pull #5