Fix #13 Enhancement structure