Merge "Refactor BaseInfo struct"