Moved Security to own file