Added function builders to simplify code