Added lib and constants