Simplified ZF setup a bit