Image library improvements