Bugfix: Version 2.0.4

Updated some classes