Added some dynamic class handling