Add Assets support