Better workspace setup