Added and working as library