Fix type issues and add strings data