Added more fields, security model