Refactor configuration of entities in order to use a 'links' key