Converting to method based parsing and not constructor based