Also removing Marshal from model specification