Added a few improvements