Updated lib with many new features