Few technical modifications