Insight improvements

improvements based on Sensio Insight