Code improvement and new features added