Add an initial support to wait list for demo purposes