Finished replacing configuration classes