Refactoring of islandconfig