pass through ost map directive, fixes and refactoring