Restructured assets to use Compass