refactoring + base builder for observable entries