Extend skeleton code