Added serializer to when holder