Added codes support