Change data type
Add Frame decorator handling