added more vault specific architecture