tidied up configurations
restructured completion object policy