Removed skeleton creation to separate class