improved the repositories and entities for the configurations