Added orm adaptor