Adding z-shell related stuff