Plugin Ls - fix
Additional data for enities - refactoring