Some functions and features added