Added maven support
Update grammar