Change chapters entity to support collection