Improved core

Setting defaults