Small Fixes. Added Security Base