Added more framework along with model fixes