Made it nicer to filter/specify types data