Added lib and headers