Adding skeleton architecture