refactor resource model fields out to kwargs