Added missing methods and fields in model