Changes due to assets extension