Mike: libraries enhancements