Updated component behaviour