optimized entity retrieving
oops wrong file