added more Features, Versioning