Changed code and added method - findByName