Added support for spring data