Adding doc and new features