Added some Features for better use...