Better configuation support + implement more config options