Refactored by removing unnecessary Definition class
Bumped version to 0.0.13