FIX: Revamped security measures