Added threads and other features