Modified structure to fit Kit specification.