Changed method name
first changes for id management