Simplified the grammar
Added import support
Simplified the grammar
Added import support