Improve parse method