Adding feedback capabilities