CommonAPI: refactor System for support old types