Feature/fs1511 deprecate entitypointer