Moved more specific configurations to separate files and updated them