enhanced domain and data layer of application