Model|Resources: Internal Model API improvements; cleanup