Issue #135 - Added missing package declarations