Add skeleton to support window by id