Much simpler parsing logic