Renamed userid to username to make differerence with id more clear
Added assocation for entity->arp