Improved the package and added find method