Added more functionality for programmer