framework fix each to have less properties