Updated library with forms