Improved parser, updated to functions call