Improved a bit towards dependency analysis