[*] Added new features