Secure building functions

Follow