Adding proper intra handling of Configs