Enhancing Complex interface
Reduced usage of Complex class to improve performance