Added some requested features