Added some minor features