Add refreshability and nested models