Model classes updated
Bean classes updated