added parser and structure