Added device type
Starting with bnfc grammar
updated