Updated Handle functionality