Added more user library code