Bugfix: Changed namespace imports