move things to configuration