Updated for ENV and generic assets