Added logic components