Going back to non generic implementation to follow WPF codebase.