added fixes & Linkage service