Removed local libs and added support for null value handling