Feature/external dereferencing