Changes as per the JabbR community feedback