Even more features added