Added class module for dropdown data
Code cleanup