Sanitized environments, added Spring