Add some improvments