Added some dynamic class handeling