Fixed views/functions to work with model changes