Numerous features added