Add some improvement ideas