Fixed Files for Client, need to do it for others entities