Added builtins and aggregates. Input builder completed.