fixing wrapping to get rid of warning
adding serialized id to get rid of warnings