Add improvments