Added initial security check support