added contrib and custom modules and features