updates & refactoring to SBAsset classes