Adding changes to support facebook beta