Added instance name control to all functions