Basic library support, part 2