Started transforming into composition based OOP
diff --git a/lib/Krawfish/Result/Group.pm b/lib/Krawfish/Result/Group.pm
index e2db10d..ea84e71 100644
--- a/lib/Krawfish/Result/Group.pm
+++ b/lib/Krawfish/Result/Group.pm
@@ -164,7 +164,9 @@
 };
 
 
-sub current;
+sub current {
+  ...
+};
 
 
 # Return a hash reference with information
diff --git a/lib/Krawfish/Result/Limit.pm b/lib/Krawfish/Result/Limit.pm
index 7f9bbb9..62349f9 100644
--- a/lib/Krawfish/Result/Limit.pm
+++ b/lib/Krawfish/Result/Limit.pm
@@ -47,11 +47,15 @@
 };
 
 # May return a hash reference with information
-sub current_match;
+sub current_match {
+  ...
+};
 
 
 # May return a hash reference with information
-sub current_group;
+sub current_group {
+  ...
+};
 
 
 # Stringify collector
diff --git a/lib/Krawfish/Result/Remote/Sort.pm b/lib/Krawfish/Result/Remote/Sort.pm
index e6eec6d..54a9b1b 100644
--- a/lib/Krawfish/Result/Remote/Sort.pm
+++ b/lib/Krawfish/Result/Remote/Sort.pm
@@ -25,6 +25,8 @@
   }, $class;
 };
 
-sub next;
+sub next {
+  ...
+};
 
 1;
diff --git a/lib/Krawfish/Result/Segment/Aggregate/Base.pm b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
index 4923267..8b101df 100644
--- a/lib/Krawfish/Result/Segment/Aggregate/Base.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
@@ -9,13 +9,16 @@
 };
 
 # Per default do nothing
-sub each_doc {};
+sub each_doc {
+};
 
 # Per default do nothing
-sub each_match {};
+sub each_match {
+};
 
 # Per default do nothing
-sub on_finish {};
+sub on_finish {
+};
 
 # Not implemented on base
 sub to_string {
diff --git a/lib/Krawfish/Result/Segment/Enrich/Snippet/Element.pm b/lib/Krawfish/Result/Segment/Enrich/Snippet/Element.pm
index 1190093..47c9f4d 100644
--- a/lib/Krawfish/Result/Segment/Enrich/Snippet/Element.pm
+++ b/lib/Krawfish/Result/Segment/Enrich/Snippet/Element.pm
@@ -1,13 +1,21 @@
-package Krawfish::Result::Snippet::Element;
+package Krawfish::Result::Segment::Snippet::Element;
 use Krawfish::Log;
 use strict;
 use warnings;
 
-sub start_char;
-sub end_char;
+sub start_char {
+  ...
+};
+sub end_char {
+  ...
+};
 
-sub open_html;
-sub close_html;
+sub open_html {
+  ...
+};
+sub close_html {
+  ...
+};
 
 1;
 
diff --git a/lib/Krawfish/Result/Sort/Priority.pm b/lib/Krawfish/Result/Sort/Priority.pm
index cde1362..fde2c8c 100644
--- a/lib/Krawfish/Result/Sort/Priority.pm
+++ b/lib/Krawfish/Result/Sort/Priority.pm
@@ -127,7 +127,9 @@
 # in sorted order to document the sort criteria.
 # Like: [[class_1 => 'cba'], [author => 'Goethe']]...
 # This is necessary for the cluster-merge-sort
-sub current_sort;
+sub current_sort {
+  ...
+};
 
 
 sub to_string {