Feature/fix externalizer ser