Bug fixes
Added packages