Removed TODO comments
Added additional required packages