Working on Assets so it can be extended