Fleshed out Apache model further