Better instance handling