SA improved. Configuration files added