Fix incomplete FocusTypes implementation, modify database to store strings instead of integers