Added load time functionality