Add strong element typing