Added support for custom user libraries and includes