Added more functionality around rendering keys.