Added master_key context