Change Linkable module into wrapper classes