Add assets handling