Fixed NPE of security context and replaced ActualParameter objects  with DataObjectType obejects