Added instance spec, work on instance handling