better schema - possible final