Add core features from GF branch (without grammar editing)