Improve interface and hard code lists