Added prototype adapter system