Making configuration more lightweight