Merge "Add a few type for Analog frontend"