Removed duplicate class definitions