Features/statd redesign