Better use of content module