Moved to common load method and added `flatten` command