[Easy-POC2-1.0] Updates for parser, ui part.