Add calendar/date component
Alter resource keys