Add Promise and Router classes