Some updates/added functionality
versioning