Change config format and create a dedicated class for config