added possibility to track pointables in general. Small refactoring.