Added functionality for the issues