Add more logging in models