Reworked Daisyon and added extension method