Add support for internal storage