Updated to match latest schema