[ajey] Adding new features