Fix geometry secion, add SRC names