Use proper lists. Add decimal and alpha classes