split up files and use explicit syntax for instance prop adding