Adding extra fucntionality and patched morphia version