Added ParserComponent and more service logic