wrapper cleanups
add dependency definition