More configurable

Moving more fields to config, we were using defaults ones.