Moved code to vih_core