Add metro code support