Updated metadata
Added threading support