Merge "Add parse package logic"