Updated Basemodel

updated base model handling so all methods are called