Fixed some model issues. Playing with Entity fields