Init and Fill added to grammar