Switched to direct inheritence for complextypes