Feature/reduce file size