Refactoring.

Move instances handling features to another class