Some features additions