Started converting domain entities