Rework strong types