Bumped version and refactoring