Added Constant file and improve query for Library