Customer model and parser changes