Added skeleton and entities