Updates to library and framework
Portfolio DB context completed