Work on configs
Added immutable field support