0.0.46.4

Component based to be used in future architecture.