Changed to support objects instead as dynamic did not work like i hoped with other modules

Lead to runtime failures