Updated libraries to new format
Refactored default options