Reduce constructor complexity