Working on the AOP code as it doesn't play nice with Json.Net