Custom messages handling added for end device