Changed to use Observable on Common.js