Update to psr-4, add NAS trait