Comments features added