Update to version 0.5.4 also added helper classes too