Feature database restructure