Adding support of libraries and options