improve logging + specify database annotation targets