Various features added