simplified build
added factory services