Fix Store to only extend declare-based Models