Removed objects protocol and added generics from the finder