Fixing hard coded internal list