Added custom Flash Message support;