Application specific support added