Re-implementation of security