Improved find command