Improves parser
Changes keyword in arguments