Added work type check