Implemented library extending and auto detection
Added some more strictness