OK, will move it to configuration