Reworked version  -> 0.6-SNAPSHOT